icontheme: fix emblemed icons fallout
authorCosimo Cecchi <cosimoc@gnome.org>
Tue, 25 Mar 2014 00:14:43 +0000 (20:14 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 25 Mar 2014 00:17:21 +0000 (20:17 -0400)
commit99dc47e7fd2cd5c5afa5777202a00ea85f19c359
tree020737d87e2af5ef122eff1c0cd80b7141d5ba96
parent206d43dcb4fc0cf56c2a1af294fc52fdfb3e1d58
icontheme: fix emblemed icons fallout

Commit faba7df4fea6cd09470b3b2cc277c35e6cf7c380 changed the logic in
apply_emblems() so that GtkIconInfo->emblems_applied would be set to
TRUE even in case there was no emblem info available, which confuses the
theme cache.
This commit changes the logic back, so that NULL is returned from
apply_emblems_to_pixbuf() when there are no emblems available, fixing
the bug.

https://bugzilla.gnome.org/show_bug.cgi?id=726830
gtk/gtkicontheme.c